$ git diff
diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
index 5309697..c78133a 100644
--- a/pkg/daemon/daemon.go
+++ b/pkg/daemon/daemon.go
@@ -598,7 +598,7 @@ func (dn *Daemon) CheckStateOnBoot() error {
        } else {
                // currentConfig != desiredConfig, and we're not booting up into the desiredConfig.
                // Kick off an update.
-               if err := dn.triggerUpdateWithMachineConfig(stateAndConfigs.desiredConfig); err != nil {
+               if err := dn.update(stateAndConfigs.currentConfig, stateAndConfigs.desiredConfig); err != nil {
                        return err
                }
        }
diff --git a/pkg/daemon/update.go b/pkg/daemon/update.go
index 158f876..4e78920 100644
--- a/pkg/daemon/update.go
+++ b/pkg/daemon/update.go
@@ -69,6 +69,12 @@ func (dn *Daemon) writePendingState(desiredConfig *mcfgv1.MachineConfig) error {
 func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig) error {
        var err error
 
+       if dn.onceFrom != "" && !ValidPath(dn.onceFrom) {
+               if err = dn.nodeWriter.SetUpdateWorking(dn.kubeClient.CoreV1().Nodes(), dn.name); err != nil {
+                       return err
+               }
+       }
+
        oldConfigName := oldConfig.GetName()
        newConfigName := newConfig.GetName()
        glog.Infof("Checking reconcilable for config %v to %v", oldConfigName, newConfigName)

net/http: request canceled (Client.Timeout exceeded while awaiting headers)